apply patch from Bogdan Nicula which fixes a crash on GdkWindows which

2007-05-24  Michael Natterer  <mitch@imendio.com>

	* gtk/gtktooltip.c (find_widget_under_pointer): apply patch from
	Bogdan Nicula which fixes a crash on GdkWindows which have no
	GtkWidget as user_data (bug #440890).

svn path=/trunk/; revision=17906

diff --git a/ChangeLog b/ChangeLog
index 43966620ca80f9d98fb5b78e2d2623d443fc5675..3725c45488acf6817448bf1f8e85373326f9156f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-24  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtktooltip.c (find_widget_under_pointer): apply patch from
+       Bogdan Nicula which fixes a crash on GdkWindows which have no
+       GtkWidget as user_data (bug #440890).
+
 2007-05-24   Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index bfcf7436bf58c1d1db28c26b24ab594d4706c88e..d612da5bfaf7e71bf4c565a0466622d1b78399d7 100644 (file)
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -461,11 +461,14 @@ find_widget_under_pointer (GdkWindow *window,
   GtkWidget *event_widget;
   struct ChildLocation child_loc = { NULL, NULL, 0, 0 };
 
+  gdk_window_get_user_data (window, (void **)&event_widget);
+
+  if (!event_widget)
+    return NULL;
+
   child_loc.x = *x;
   child_loc.y = *y;
 
-  gdk_window_get_user_data (window, (void **)&event_widget);
-
   while (window && window != event_widget->window)
     {
       gint px, py;